From: Gunnar Hjalmarsson Date: Sat, 10 Dec 2022 11:10:22 +0000 (+0100) Subject: New upstream version 1.1.6+ds1 X-Git-Tag: archive/raspbian/1.1.9+ds1-4+rpi1^2^2~15^2~3 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https://%22bookmarks:/%22/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22?a=commitdiff_plain;h=033e7c9b8fe576d4c5e9f635c047e42de31e610c;p=opencc.git New upstream version 1.1.6+ds1 --- diff --git a/CMakeLists.txt b/CMakeLists.txt index d407e99..ee08591 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,7 +17,7 @@ # ######## Project settings -cmake_minimum_required(VERSION 2.8) +cmake_minimum_required(VERSION 3.5) set (PACKAGE_NAME opencc) project (${PACKAGE_NAME} CXX) include (CTest) @@ -72,6 +72,8 @@ include(CPack) if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") set(CMAKE_MACOSX_RPATH 1) + set(CMAKE_CXX_STANDARD 14) + set(CMAKE_CXX_STANDARD_REQUIRED ON) endif() ######## Directory @@ -111,7 +113,7 @@ configure_file( install( FILES - ${CMAKE_BINARY_DIR}/opencc.pc + ${CMAKE_CURRENT_BINARY_DIR}/opencc.pc DESTINATION ${DIR_LIBRARY}/pkgconfig ) @@ -202,7 +204,7 @@ add_subdirectory(test) if (ENABLE_GTEST) if(NOT USE_SYSTEM_GTEST) - add_subdirectory(deps/gtest-1.11.0) + add_subdirectory(deps/gtest-1.12.1) endif() enable_testing() endif() diff --git a/NEWS.md b/NEWS.md index fa6e2ef..eac911f 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,5 +1,12 @@ # Change History of OpenCC +## Version 1.1.6 + +2022年12月08日 + +* 修复python3.11 macos构建 ([#744](https://github.com/BYVoid/OpenCC/pull/744))。 +* Bump gtest 和 benchmark 以与最新的 github runners 一起工作 ([#747](https://github.com/BYVoid/OpenCC/pull/747))。 + ## Version 1.1.5 2022年12月03日 diff --git a/data/dictionary/STPhrases.txt b/data/dictionary/STPhrases.txt index 078e2b5..6446d36 100644 --- a/data/dictionary/STPhrases.txt +++ b/data/dictionary/STPhrases.txt @@ -23059,11 +23059,11 @@ 恐韩症 恐韓症 恐高症 恐高症 恐鸡症 恐雞症 +恒生 恒生 +恒指 恒指 +恒大 恒大 恒星周期 恆星週期 恒春野百合 恆春野百合 -恒生指数 恆生指數 -恒生股价指数 恆生股價指數 -恒生银行 恆生銀行 恒言录 恆言錄 恕乏价催 恕乏价催 恙虫 恙蟲 diff --git a/data/scripts/sort_all.py b/data/scripts/sort_all.py index 20d82fd..d1ba06c 100755 --- a/data/scripts/sort_all.py +++ b/data/scripts/sort_all.py @@ -10,8 +10,8 @@ if len(sys.argv) < 2: print(("Usage: ", sys.argv[0], "[directory]")) exit(1) -dirtectory = sys.argv[1] -files = glob.glob(dirtectory + "/*") +directory = sys.argv[1] +files = glob.glob(directory + "/*") for filename in files: print(filename) sort_items(filename, filename) diff --git a/doc/opencc.doxy.in b/doc/opencc.doxy.in index a93862d..1dcf0c7 100644 --- a/doc/opencc.doxy.in +++ b/doc/opencc.doxy.in @@ -909,7 +909,7 @@ HTML_STYLESHEET = # user-defined cascading style sheet that is included after the standard # style sheets created by doxygen. Using this option one can overrule # certain style aspects. This is preferred over using HTML_STYLESHEET -# since it does not replace the standard style sheet and is therefor more +# since it does not replace the standard style sheet and is therefore more # robust against future updates. Doxygen will copy the style sheet file to # the output directory. @@ -1707,7 +1707,7 @@ UML_LOOK = NO # the class node. If there are many fields or methods and many nodes the # graph may become too big to be useful. The UML_LIMIT_NUM_FIELDS # threshold limits the number of items for each type to make the size more -# managable. Set this to 0 for no limit. Note that the threshold may be +# manageable. Set this to 0 for no limit. Note that the threshold may be # exceeded by 50% before the limit is enforced. UML_LIMIT_NUM_FIELDS = 10 diff --git a/package-lock.json b/package-lock.json index 5a85086..4461c05 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "opencc", - "version": "1.1.5", + "version": "1.1.6", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "opencc", - "version": "1.1.5", + "version": "1.1.6", "hasInstallScript": true, "license": "Apache-2.0", "dependencies": { diff --git a/package.json b/package.json index 0f91397..92b7b75 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "opencc", - "version": "1.1.5", + "version": "1.1.6", "description": "Conversion between Traditional and Simplified Chinese", "author": "Carbo Kuo ", "license": "Apache-2.0", diff --git a/src/SimpleConverter.hpp b/src/SimpleConverter.hpp index 206edea..56932b7 100644 --- a/src/SimpleConverter.hpp +++ b/src/SimpleConverter.hpp @@ -66,7 +66,7 @@ public: /** * Converts a text and writes to an allocated buffer - * Please make sure the buffer has sufficent space. + * Please make sure the buffer has sufficient space. * @param input A C-Style std::string (terminated by '\0') to be converted. * @param output Buffer to write the converted text. * @return Length of converted text. @@ -75,7 +75,7 @@ public: /** * Converts a text and writes to an allocated buffer - * Please make sure the buffer has sufficent space. + * Please make sure the buffer has sufficient space. * @param input A C-Style std::string limited by a given length to be * converted. * @param length Maximal length in byte of the input std::string. diff --git a/src/UTF8Util.hpp b/src/UTF8Util.hpp index a04a6fc..9d3e39b 100644 --- a/src/UTF8Util.hpp +++ b/src/UTF8Util.hpp @@ -145,7 +145,7 @@ public: } /** - * Returns ture if the character is a line ending or end of file. + * Returns true if the character is a line ending or end of file. */ static bool IsLineEndingOrFileEnding(const char ch) { return ch == '\0' || ch == '\n' || ch == '\r'; diff --git a/test/testcases/s2t.ans b/test/testcases/s2t.ans index b402a98..25511ae 100644 --- a/test/testcases/s2t.ans +++ b/test/testcases/s2t.ans @@ -7,4 +7,6 @@ 新的理論被發現了。 金胄不是金色的甲冑。 經理發現後勸諭兩人 -想到自己一緊張就口吃，我就沒胃口喫飯 \ No newline at end of file +想到自己一緊張就口吃，我就沒胃口喫飯 +恒指最新消息，恒生指數跌破 2 萬點 +恒生銀行和恒大集團發佈財報 \ No newline at end of file diff --git a/test/testcases/s2t.in b/test/testcases/s2t.in index b1db027..fe24025 100644 --- a/test/testcases/s2t.in +++ b/test/testcases/s2t.in @@ -7,4 +7,6 @@ 新的理论被发现了。 金胄不是金色的甲胄。 经理发现后劝谕两人 -想到自己一紧张就口吃，我就没胃口吃饭 \ No newline at end of file +想到自己一紧张就口吃，我就没胃口吃饭 +恒指最新消息，恒生指数跌破 2 万点 +恒生银行和恒大集团发布财报 \ No newline at end of file